Only scroll if we have focus. (#316310, Paolo Borelli)

2005-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_preedit_changed_handler):
	Only scroll if we have focus.  (#316310, Paolo Borelli)

diff --git a/ChangeLog b/ChangeLog
index fe7198919f1ff625bc032b490431025096917dd0..14d35ba8a2b89c6b343d177a885db45683b59306 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_preedit_changed_handler): 
+       Only scroll if we have focus.  (#316310, Paolo Borelli)
+
        * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism,
        spotted by Crispin Flowerday.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe7198919f1ff625bc032b490431025096917dd0..14d35ba8a2b89c6b343d177a885db45683b59306 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_preedit_changed_handler): 
+       Only scroll if we have focus.  (#316310, Paolo Borelli)
+
        * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism,
        spotted by Crispin Flowerday.
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e0978b5465c1ad461b3123fff7aba9e5cb41c517..f0249052eab5dcfe3356b7ee428a88ec3ce9f5dc 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6745,9 +6745,10 @@ gtk_text_view_preedit_changed_handler (GtkIMContext *context,
   pango_attr_list_unref (attrs);
   g_free (str);
 
-  gtk_text_view_scroll_mark_onscreen (text_view,
-                                      gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                                "insert"));
+  if (GTK_WIDGET_HAS_FOCUS (text_view))
+    gtk_text_view_scroll_mark_onscreen (text_view,
+                                       gtk_text_buffer_get_mark (get_buffer (text_view),
+                                                                 "insert"));
 }
 
 static gboolean